Fix a few bugs, update readme