Smoothed Out Leveling and End of Battles

Fixed a few bugs and cleaned up the leveling