bugfix and visual changes