Cleanup/correct.
Fix default init.
Add rendering classes.