Cleaned up for future compatability with 2.10
Fixed a bug where rectangle would expand wrongly, leaving parts of the model off-screen
 Tested part of the spatial model and collectiongeometry