Change class references to otext::replace throughout
Update selected comments.
Update selected comments.
Remove redundant include statements; Add otext.cpp include statement where needed.