Adds time expressions and fixes the grammar so places also work.