Some clean ups and adding up of descriptions and others