Added FPS, other small changes