Things are working now - no master script
Changes to avoid using stopserver script
Use empty geometry to speed up jobs