More work on ct.agda