Adding spatial and temporal steps to CFI grammar
Fixing definition of number