Added drop option to Collator
Fixed _finalize_axis for plotting