Updated: better schedule management
Fix: bugs