Merge pull request #21 from borkweb/feedback-faves-and-flags

Deal with state changes in a more consistent manner
Capitalization