Staring Contest: Another Minor Patch

Minor bug fixes, quality-of-life improvements