Fixed a couple of bugs, updated readme