Added default production section and some minor cleanup