Update demo activty and adapter, add some comments