Update shops
Update PMC NPCs, move Athira garage
Syntax corrections