Fixes for new .key syntax for 2.01.0 (#map still crashes in it, so stick with 2.00.9 for now anyway).  Plus some other misc fixes.