Bugfixes: Working towards emulator compatibility. Still problems with external storage