lots of cleanups, mostly visual and text display