bring in the graphical changes thanks to @surhorse close #23, close #14