Bugfix 3

Fixed several bugs that resulted in crashes. There is now a side-effect where the player can have health that goes below 0, but still dies at the end of the combat round. Not sure of a fix for that, but much more preferable than the game just crashing if you lose a fight