updated todo and tiny fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO.txt
updated todo and tiny fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	TODO.txt