Circular buffer fix + rejection fix + misc fix in display