Lock cleaning

    No need of recursive lock anymore, and some useless lock removed
Lock not needed
Indent
More information in the channel json
Merge remote-tracking branch 'upstream/master'