Progress in the design of the SPL, an H- high-intensity LINAC at CERN