WIP: add some debug info