fixed quickswitch and added some small tweaks