replaced TODO
spacing
minor tweaks
a few more tweaks