Small tweaks, use more friendly content type