fixed some mistakes with emilie