minor changes
some bugs