various fixes
various fixes