v2.0.1: Add Egg, Some Bug fixes