Issue 372 3

Addresses issue #372.

Covers models, optimization, scripts and space.