Tweaks

Mostly fixes from testing left behind and string changes