Misc changes... still getting 'performing pause of activity that is not resumed/stopped execption occasionally