bugfixes after real test