More changes, and insertions yay/