Minor change

Making optional the 3rd parameter of findAndModify
Fixed bug with findAndModify