small fixes etc.