Added nearby stops and refactor schedule