add a couple of new params
fix that brutally long filename
Merge branch 'master' into la-county