fixed some other stacked bugs