more fixes etc
merge