update location names and complex/hash #46