Polishing

Just some polishing of artfacts.