bugs fixed; demos added