added tests, and updated readme
cleanup ws
remove useless comments