Fixed some console spam and Barrel behaviour
Merge branch 'origin/master'