Added some more protocol issues. The code is quickly going out of hand
Minor update
Some more mess