readme and TODO updated
clean up