fixed some errors still not working