a little more cleanup, modify README as well