various fixes :D