Final fixes in movement system