bugfixQS: bugfix part & hacks 4