mostly android dev related changes