media added and some fixes