Fixing empty BSON id issue
Finishing a few things, still need to clean it up