a few more todos