Various changes in prep for launch