Corrected constants and improved models.