Checking and minor corrections