updated a few more todos