* fixed some potential errors
* minor changes in demo1