fix disabled svcs, fix map data, add tools