multiple fixes having to do with the activity