Added FPS limit and refactored names