updated todos

Conflicts:
	README.md
Version 0.2.6