fixed some errors2