minor changes + bug fix in scheduling tasks