See #8

Plus various minor fixes:
- removed stdio.h when not needed
- removed debug stuff (bug, TRACE
- removed commented printf