fixed some bugs because of conversions and android version works now