Lots of refactorings. Uncommented out the powerups code. Got rid of all compile warnings.