Animation fix (this time for real) + FPS fix