minor improvements
Merge remote-tracking branch 'origin/master'
first attempt at chatting and some major indentation changes