Updates to streamline Display class and bugchecking.