Update and improve README and add TODO