minor fixes and tweaks.