updated todos, reference and bit about context