Update maven and general tidy