Changes

After having actually gone through it myself.