major cleanup, update README, new API again