Fixed 'none' values

fixed none values being passed by the player damage loop and another couple small bugs.  Also made a number of tweaks to the game play.