Fixed a few small things in ch4. Ready for live!