Flat arrowing for scenario steps implemented. TODO: nested arrowing and steps.
Flat arrowing bugfixes.