Add conditional
Fix comment stripping
Fix file directives