added support for Android (small setting changes)