fix issue with apu save
Fix another issue with cpu save
Get basic prototype for save working