Some stying fixes etc