Flesh out documentation and minor clean up