First fix from intersection problem. Looks better but there is still something todo.
Removed unused stuff.