more bugfix, improve plots