some fixes etc ..