fixed errors so far