o Unify Keywords (but we should also take case into account)
o update some todos.