added cleanup, fixed problems when there is a dvd