Combat bugs

There were a few bugs that were fixed, and the difficulty/reward levels
were tweaked for better balance.