bugfixQS: bugfix part 3 & hacks