Add display. Fix bugs found due to display