Random small changes. Prep work for Judge windows.
Merge remote-tracking branch 'alt/gui' into gui