things
various fixes
merge