fixed some mistakes in last commit