bugfixes
a quite stable version