more outsourcing and fixes