Minor changes, still problem with color maps