fixed some crap with the mover classes