Rework some copy and fix some issues.