tweaks, cleanup