Fix up some error reporting
Update TODO