another pass at fixing the unloadloot / stacking issues