remove some TODOs, add errors