Updated docs and comments