Added Egg Names + Few fixes