Added support for non-uniform keywords.
Completed some todos.