added a few more todos

added a few more todos