Corrections and small adaptions.