More corrections based on Domenic's comments.