Updates and Changes

Several string changes etc.