update scheduler AVG methods and bug fix