madeleine adds cone forms and fixes some typos