Restore android suport
better bts for touch
Adds Map