improvements made to the barn
Merge branch 'master' into table-feature