Fix bugs, finish contour plot lists and switching between lists