various fixes again