Reducing FPS and fixing bugs