Added buns and fixed some bugs.