various fixes.
tweaks