Commented out some debug lines and finalized most member variables in
the CD classes