lots of small nice changes.

Still not completely complecent, but a lot of things seems much better now