tests, tweaks, bugfixes