small changes to match the contribution rules
Merge branch 'feature/roots' into develop
small code fixes