scheduler update, minor fixes