more tweaks and fixes.