Fixed contours and added small functionality extras