Minor fixes from commit 9669900
Added automatic contract creation to customers
Workflow improvements part I. ref #32