Quick fix on the movement fields, most likely bugs still exsist