activity workflow fixes - issues #1, #15, #12, #11, #10