add the final touches blake wants
Merge branch 'brandon'