adapted temp table names in queries so that they can run in parallel now, overall cleanups
merged query parameter changes and parallel execution changes
corrected a merge mistake in q25.sql, corrected a wrong option check in runQueries