various tweaks
code cleanup run