More and more changes to the style mainly