A little code fomatting and added some TODO's.
Merge remote-tracking branch 'origin/master'