Changes and fixes- Offline mode!