Minor changes to some files
Minor work on parallelRunner and init

Conflicts:
	init