made all the changes! for first launch