add a general location and a creator facet, cleanup types