General tidy and improvements.