errors + changes