Polish and chat integration
Merge branch 'Austin's-Branch'