removed old switch
added missing word breakers, solve current ident highlight issues