more changes to get things ready for production