added a new resource to gazetteer, fixed some bugs