added some more deviceready checks