Minor updates

clean up of code and also added new code for the powerup part of the
game.