...
fixed some bugs