Improve documentation, add TODO to documentation