Tweaks, moved scipy egg name to class var