cleanup
fixup arrive / depart toggle