v2.0 changes

changes as discussed - like single merged json dataset, optimized
rendering, cleanup, etc...