Add media and minor fixes