Merge pull request #1 from caagency/master

making dev caa
updates for clarity
Merge pull request #2 from caagency/development

cleaning up