Changed/added variables.
Added keywords.
Added new tests.