bugfixes and time schedule stuff