Some fixes, minor changes & some demos added.