Added otherD, W, M.
Gonna hook up the graphs with totalD, W, M later.
Merge remote-tracking branch 'origin/master'