All the latest fixes and changes (includes map enhancement example)

Not done yet. Meeting will continue in two hours (15 EST) today.