Added all tillers, fixed some bugs