Fixed iterations
Small fixes and old code removed
Changing # iterations does not cause script to be recompiled anymore
Project structure cleanup, miscellaneous fixes