gtk3 upgrade and general tidy up