some commits
geofences not working, fixed merge