proper file names and style
add dbg.h