bug fixes + trash removal