added a few more todos