Changed colours of samples
Fixed some To-Dos
Added noCut option for variables