updated stuff to make it work better on android