I had some free time so thought I'd do another merge. The only thing that might be broken is Jens' joystick fixes for MSVC. I went with the mods from bf -- please test! Chris