minor cleanup
replacer bug fixed