small fixes, added In The Process Activities
Merge remote-tracking branch 'origin/master'