changes fixes etc