Got text-replace working
Remove trace, cleanup
Update comments