major fixes over media