New demos added and bug fixing