Tested on S3 - fixed some few mistakes, but still failes to get current location data