Pupils distribution changed, and other small changes