better macro system based on _ that does not require having a stub for every macroed function
add comment on debug troubles
reformatted for clarity