Fix contrasts
issue #283 and minor other changes
#284
Merged
contrasts
issue #283 and minor other changes
#284