Began fix to scheduler. Further aesthetic improvements