bugfix and display improvement