Update wallsocket to the new module class
Minor fixes