- More Android visualization and comments
Updated for previous changes