The second order is for two types of chocolate shapes where both shapes have 1 curved surface each and 0 edges. One of the shapes has 2 flat surfaces and 0 vertices, while the other has 1 flat surface and 1 vertex. Which of the following are those two shapes?