Tweak tons of little code