Added school class, and some random edits