bug fixes, media clenup