Corrections and minor improvements