added a couple more todos