Make it work with Jelly Bean
Add some debug output