tweaks and fixes.