various fixes2