more various fixes.