visual improvements
code improvements.