Misc cleanup and doc addition