Some testing revealed some minor problems in CELCT

CELCT should now be ready for use!