Fixed misspelling issue
Some fixes in defined protocols
Some improvements