Update to past data for 2012 and updates to other normal costs

JP updated the normal costs for us.  2012 was updated as well as other
normal costs.