trivial change
also, adds lots of changes to edit activated session controller