nothing to do with editing, a couple bug fixes
Merge branch 'master' into edit_card