Superfish and other changes