added skimming of trees, removed bugs