Various Tweaks

Some corrections