structural revisions
Merge pull request #3 from bjacobel/Brian

structural revisions