bugfix
fixed some bugs