Wrapping up changes for launch