More bugfixing. Sorry.