Update docs and comments