Integrated changes from Steven Wyns to support 64-column display.