Merged debug with master 

The debug features no longer break anything :cake: