Updated README, minor cleanup