Build 48

Almost there! Some CTS fixes. Minor improvements.