more cleanup, bug fixes, updated readme