Fixed a few copy replaces issues
cleaned up a few things