Various fixes
I've got a chatbox
Merge pull request #20 from gaandrey/stage

Stage