fixed some mistakes from the last commit