fixes and moves