syntax fixes etc