Some tweaks and deprecated the /exchange command