Bring on the Fish and a bunch of tweaks