fixed some bugs in daisy