added several todos