minor tweaks and bug fixes.  Going to bed