Add CUSTOM FIELDS to Customer Information / Order Information and Confirmation Email

Our client wants to add "Company" and "Production Title" (2 custom fields) to the questionnaire for customers who submit orders online. Can this be done? Also, we want to include different / custom fields in the ORDERINFO portion of the Order Confirmation Email that goes to the customer when they submit a new order. How do we do this? Thanks!