Added error highlighting and new config directives