added entire media section, and changed a bunch of things to improve