fixed some more issues with moving