fixes to that
bugfixes