Build, bugfixing.