cleaning up
More debugs, it just worked twice
Merge branch 'dpph_lockin' into develop