Made changes per client request

Mostly housekeeping and editing.