refactoring, fix bugs, edit subject schedule #1