Fixed promise handling
Added some logging.
Removed todo.