Add check for android, more debugging statements