Minor edit

Fixed #17 and a few other things.