safe changes
e_aes.c half merged