small fixes to pluralisation; make scheduling check more simple