to_opt fix and cargo update