more tweaks
general clean up