refine names and finish readme
clean up tests