README cleanup
cleanups plus functional tests