manage changes + some labeling.
Merge branch 'develop'