cleanup
more cleanups
update README