changed design; placement of mags; state saving bug fix