Fixed some small problems w/Display