Fixed several bugs, added CD handeling