removed stuff
change FPS
merged