Made special directives handling optional
Two bug fixes