More Assorted Changes

Tons of additional minor tweaks and fixes.