Some new pickups and fixups