Keep a TODO and fix the README more