rework some content