[EH] dienstplan refactored
[EH] small improvements