fixed some errors on last commit