Small additions to readme and refactoirng.