Big update; includes QuickTag