Cleaned up movement errors