Update README

Update README to reflect changes, and some minor fixes