Changed files for custom labeling and data.
small edits.