Latest version of the analyses

Various updates and improvements