Neatened up, setting now work, added school warning