updated todos and errors