Syntax: improved scope for option directives
Added tab completions for valid option directives