Fixed #111 - problem running multiple jobs using @@@
Code cleanup, geometric parameters can now be set without being constrained