Add --activity and --update-repo options. Fix things.