Added clusters and school editing + other small changes