Changes to contextActivities as discussed in #28

Should fix things up