Speed up heinous slow animations
Fix John being stupid

See #1878