add comments, modes and a few more flows