bugfixes, state load for new mode