various fixes 3