fixed up cd and other things, added working cat