update the readme and clean up some code
Merge branch 'readme'