expanding the taxi machinery
(commiting an old change)
just data schema comments