minor activity_history fix; and some misc