more display work and removed a lot of unused code