changes for android fixes + versioning