tree now in good working shape with new changes; partiall implemented fix to #18