Better control gradients

plus a couple o'tweaks