added exit and unfinished cd support