removed general error since errors aren't being handled any more. Updated todo doc.