More Cloud Firestore Improvements!