More usability improvements
Fixed receiving messages