Fixed compile errors and added a largely full set of 3-2 letter code mapping