more cleanup and changed readme