Some corrections and tests