add livemap, cleanups