moves fixes etc