Updated and cleaned order model and related specs. TRAD-20 #time 10m specs