Fixes some data issues, and improves the trait/special rendering.