small bugs fix regarding labeling and renaming.
Documentation added