Fixed some things up.
Poorly I am not able to test them on android in the moment.