One last pass to add in some documentation and minor tweaks