added some stuff to help me diagnose the problems in android