Minor fixes and contour pages