fixed q11, small tweaks and stuff