bigger test, more bugfixes...