Gooder spacing and a few small tweaks