Second commit

Mostly production code
A few changes to DBQueries and schools.js