cleanup
incremental map load
incremental map load and other visual improvements