Adding GPU and SPU + comments