Fixes

using str_replace instead of a bunch of explode/appends