more tweaks, cleanup