Add protocol version plus some identation fixes