Cleanups, and some tweaks to screen capture positions