Updated plot 2 features
Re-organnized options file (and class)