minor changes
Update README.md
update some name things
merge with master