More testage and bugfixing