minor fixes, and tweaks.