Removed chaining for findAndModify to be similar to other drivers and fix some subtle bugs
Merged in master changes