remove CD
minor changes + compile