CLOP stabilization

Add some sanity check and houskeeping stuff