More bugfixing...