minor tweaks. 60% done.