Add more info and correct some inconsistencies.