SAEv1.1

fix some bugs