bugfixes
many fixes
a few fixes