Fixed some linktree issues and backed out some changes made to support contours as a native variable