Makes these a little simpler to follow and provides some more up-to-date information based on recent tests and developments.