bugfixes for android build
refactoring for maintenance