Various corrections, modifications, improvements.