Add Brown & Cantwell, fix Warner, add '$COUNTY', define 'DEPENDENT'
fixes #543
fixes #544