more bugfixes in quark handling