movement validation fixes