Minor tweaks.  Current source code for most recent apk (2.2.0)