Pushing all the minor changes so they aren't lost