Much rework of skills, displays.