cleanup bugfix and clear outline