Mostly bugfixing