made some tweaks, mostly organizational and formatting