Lots of tweaks

Not satisfied yet, but it's better.