Testing and bugfixes.