fixes for removal of dirs ... better now i think