some scheduler changes and stuff