more cleanup, TODO section in README