Fixed text bug and added versioning
merge conflicts