made it so we don’t need to use wait/ sleep to get location + other small changes