small tweaks, cleanups, fixes.