Google maps drawing of route and diverts now works. Misc cleanup/bug fixes.