misc addtions and corrections to my android demo