Try and tweak minor stuff