courier - bug fixes
added scheduler