small changes and cmap