lots of fix

mainly for schedule