some cleaning
fixes duplication of labs
adds timing for queries
moves (temp?) the model changes to a centralised file
rename sampleData to expression