Added 2i to replace most of the coverage commands.
Fixed role index.
Fixed print of add 2i info.
Merge branch 'test' into dev