better looking tree. lots of small changes