refactoring
Updated readme
Minor typos