Tested some stuff

Added some, removed some
Media changes

Several changes to Media parameters