cleaned up some todo's
waves, statesofmatter level descriptions.
staesofmatter, waves
Merge remote-tracking branch 'choose_remote_name/master'
after merge