Huge leap toward working displays. Fixes #26. Fixes #22.