schedule updates, database updates, misc tweaks
Merge remote-tracking branch 'origin/master'