lots of visual improvements