Fixed #940: Use separator when concatenating locality name
Minor additions to docs
First steps towards resolving #533