Cleanup and update TODO
Updated docs