Update DISP and DISPLAY methods.

Closes #642 and #340.