now with number stuff and tighter object order
terms improved
Merge branch 'cam-15'