added more plotting, reorganized retina import (stop duplicates)