ticket:13 different bugfixes