fixed some errors left