Incorporate Hugh J. Devlin's corrections