added todo notes
fixed merge
Merge remote-tracking branch 'spacedman/master'