Updated output formatting, added TODO, handle unknown directives better