nya
fixed some bugs