more things
fixed merge conflicts
fixed merge conflicts
edits to mood index. still can't test thoroughly until calvin fixes the submit