More nips and tucks, rewrote Launcher