Web socket account
Some small fixes and more comments