Migration to Android Studio. Minor bug fixes.