Lots of production improvements