another cleanup, working on testing update activity with tags