Fix handling of corner case cell variables.
Fix plot type switching and do not set plot size unless told to