Commenting + udpated demos