updated android api, minor fixes