-q (quick) option + minor tweaks