add some TODO's, docs & cleanup