Lots of tweaks!

Sorry, not very specific but it’s time to go home! ;)