Fix egg numbers and add a few more