update scheme
tweaks