Removed smoother. Causes problem with S line crossing Other bugfixes.