It will get better, unfortunately there isnt much that can be done about the ribs, I have had mine cracked before, and I even have some bruised right now. I also have a tournament this saturday and its gonna be rough with bruised ribs, cracked ones would be pretty hardcore. You might want to not fight and hopefully you'll feel well enough to do at least your kata, if not then I wouldnt try to push it, you might cause further injury