Cursor.add_option(2) does not set __tailable to True. This is a problem since the behavior of Cursor changes internally when __tailable is True. This is also a problem for Cursor.add_option(4) (slave_okay).

Cursor.remove_option is a bigger problem. In the following example the partial flag is used for the query, even though we disabled it using remove_option:

cursor = collection.find(partial=True)
cursor.remove_option(128)

The same remove_option problem exists for timeout, tailable, slave_okay, and await_data.