Added some minor tweaks and cleanups of doc