Update latest SAI changes. Closes #45 #44 #43