Adding spatial and temporal steps to CFI grammar and improved number