Minor changes.
Got rid of non-const char strings.
Misc.