Bug fixes:
 - code updates for Android 10+
 - general code cleanup
