add more location prefixes + slight restructuring