readme stuff, code clean up, couple added tests