fix for #117 and position of preprocessor directives
some debug enhancements
removing residual breaks in switch-case statements due to #ifdefs