improved android setup. almost there I guess