Sup
some options tweaks