Regarding Mercy's reworks

Would be nice if they could test the changes suggested in this thread.