changing variable names in guts of FISTA
trying to make the fit method more modular
making reshape optional