bugfixes
improve coverage