fixed some errors but there are still some present