fix compilation issues after refactoring
make android app runnable
make it runnable
small fixes