misc updates considered safe (refactor)
activity/refactor
activity/refactor