Adding Core Location support and other minor changes

- Core  Location support
- minor changes and fixes