Little fixes
Another little oopsie.
A few more tweaks and fixes.