data forward/back, modal, some tidying