Changes to character display.
Better display code.
Remove unused import.
Merge