buggy working movement + fixes