update readme and various spellcheck
fix merge conflict
update about
update about