Fixed invalid variable references, moved location of architecture check,

Fixed reading of Wide View Angle string,
Had dumb idea for a fix