Update docs and minor cleanup