fixed all errors for movement?
merge