Fixed Entity Movement & Cleaned up