feature complete as required by OWU
Change README.md and some code cleanup