Updates to make schedule work in Betty's system

Some of this is pure readabilitiy and nice display stuff, one or two
items are bug fix.