add & move some keywords