Small changes

The main changes that is made is that color-only mappings are no longer returned as plots. I also made a tiny refactor.