Changed a lot of stuff, removed FPS, tackled code inspection problems