Fixing up PSFs, hacking away at bugs (in the machete sense) (#389)