add a few things to TODO, rm return error message todo