fixed all errors so far, moving on