fixed some more move bugs