Updated .step() to use FPS & some adjustments