Fix generics, and pictures.