Merging changes into x64 version

Not much more I can do until I follow my Tkinter tutorial...