CoSE: general improvements