Some cleanups

- Cleaning up the code
Adding Satnav

- Adding satnav
- Fixing some other bugs