Replace Bugs

Fixed a bunch of replace bugs. Next up is adding the remove feature