Small cleanup.
Lots of cleanup, separated channels into their own type (no more swap event), added post synchronization actions (wrap).