Merge branch 'master' into dturner-patch-1
diff --git a/docs/FAQ.md b/docs/FAQ.md
index 5bcdb89..5ae2fe3 100644
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,19 +1,19 @@
 # Frequently Asked Questions (FAQ)
 
-## Can I write audio data to Oboe from Java?
+## Can I write audio data from Java to Oboe?
 
-You could write JNI code to do this. But if you are generating your audio in Java then
-you will get better performance using the Java AudioTrack class. The Java AudioTrack can be 
-created with low latency using the AudioTrack.Builder method 
-setPerformanceMode([AudioTrack.PERFORMANCE_MODE_LOW_LATENCY](https://developer.android.com/reference/android/media/AudioTrack#PERFORMANCE_MODE_LOW_LATENCY)).
-You can dynamically tune the latency just like in Oboe.
+Oboe is a native library written in C++ which uses the Android NDK. To move data from Java to C++ you can use [JNI](https://developer.android.com/training/articles/perf-jni). 
+
+That said, if you are generating your audio in Java you'll get better performance using the [Java AudioTrack class](https://developer.android.com/reference/android/media/AudioTrack). This can be 
+created with low latency using the AudioTrack.Builder method [`setPerformanceMode(AudioTrack.PERFORMANCE_MODE_LOW_LATENCY)`](https://developer.android.com/reference/android/media/AudioTrack#PERFORMANCE_MODE_LOW_LATENCY).
+
+You can dynamically tune the latency of the stream just like in Oboe using [`setBufferSizeInFrames(int)`](https://developer.android.com/reference/android/media/AudioTrack.html#setBufferSizeInFrames(int))
 Also you can use blocking writes with the Java AudioTrack and still get a low latency stream.
 Oboe requires a callback to get a low latency stream and that does not work well with Java.
 
-Note that AudioTrack.PERFORMANCE_MODE_LOW_LATENCY was added in API 26, For API 24 or 25 use AudioAttributes.FLAG_LOW_LATENCY. That was deprecated but will still work with later APIs.
+Note that [`AudioTrack.PERFORMANCE_MODE_LOW_LATENCY`](https://developer.android.com/reference/android/media/AudioTrack#PERFORMANCE_MODE_LOW_LATENCY) was added in API 26, For API 24 or 25 use [`AudioAttributes.FLAG_LOW_LATENCY`](https://developer.android.com/reference/kotlin/android/media/AudioAttributes#flag_low_latency). That was deprecated but will still work with later APIs.
 
 ## Can I use Oboe to play compressed audio files, such as MP3 or AAC?
-
 Oboe only works with PCM data. It does not include any extraction or decoding classes. For this you can use:
 
 1) [FFmpeg](https://www.ffmpeg.org/) - very fast decoding speeds, but can be difficult to configure and compile. [There's a good article on compiling FFmpeg 4.0 here](https://medium.com/@karthikcodes1999/cross-compiling-ffmpeg-4-0-for-android-b988326f16f2).
@@ -25,4 +25,4 @@
 - [SoundPool](https://developer.android.com/reference/android/media/SoundPool)
 
 ## My question isn't listed, where can I ask it?
-Please ask questions on [Stack Overflow](https://stackoverflow.com/questions/ask) with the [Oboe tag](https://stackoverflow.com/tags/oboe). 
+Please ask questions on [Stack Overflow](https://stackoverflow.com/questions/ask) with the [Oboe tag](https://stackoverflow.com/tags/oboe). 
\ No newline at end of file