Amendment to Build 12 Fix 7. A few last-minute changes to the original code, before I started changing the vertical scrolling.