syntax hilighting issues fixed