update to 3.5.1 (plus some stuff)