Fixed a few bugs in display and access