improvements to findAndModify command ref
edits with sam's fb