Update 5.8

Trying to smooth a* worked a bit.
But new problems, have to clean that up more.