fixed errors so i can merge
Fixing