more maps browser integration + cleanup