Multiple editorial improvements