Minor Tweaks

Mostly to viewport stuff.