Fixed all egg bugs