Update readme and fix small issue resulting from refactoring