more various fixes