Some bugfixing on act I