Bugfix and Polish