Small changes and removed some things temporarily for launch.