Initial changes.
Added some stuff about CC client options