Just making a few changes

---