Updated constants in multiple files, continued work on scheduler