made a bunch of changes
updated scheduler