Added CTM (finally) and more clean-up