updated and fixed bugs with display