Whole lot of changes

Multiple changes with display and cleaning and testing code