Updates for Mom match for geo-location.

Should close #46 & #47