Some more changes to revert some unfinished modifications.
Some changes to the COS.