More complete 2119 keyword list and minor fixes