More more on SM2 error codes and tidy up