document updates and added todo
Merge branch 'develop'

Conflicts:
	README.md
merge conflict fixes