debug print wrapper
some nice comment blocks
remove unused macros
nits