Nova debug

Rebased to current master