cleanup, updating docs, adding TODOs