media changes, critical fixes