added directive support for cleaner handling of org/end directives; updated print tests for it