added uber map plus some clean up