cleanup
Merge branch 'cook' into tslots2