removed fix-up rules, added some issues re media type stuff