More touch-ups and apk
Merge remote-tracking branch 'origin/master'