Updated readme and fixed a couple of bugs that resulted from refactor
Updated readme, which still needs a lot of work