Various fixes to work in 2.2.1

	- Script cleanup to ensure brackets are properly closed
	- Fixed localisations causing errors
	- Updated flags
	- Ran through validator