fixed some bugs bunny