Removed some hold-over stuff when prefix/suffix pools were shared which was causing issues, fixed a boss suffix that didn't quite fit