Fixed some thread sync issues with the display... Still a WIP though