Cleaned up Engine
Fixed camera-stuff
Merged