Done whitebox testing, more bugfixing.