various updates to help fix motion bug