Updated readme
Updated doc comments