Just about everything done

At least I think so.
Fixed a bug in the business hours logic