finish up user activity in API controllers and models