Fixed a few bugs, updated readme