multistate, bugfixes