Fixed some bugs. But adding a new element of schedule is not always correct. Review