Feature/issue 139 activity paths

Fixes #139, and activity transition problems.