only 2 errors left to fix