Added grace and dirk, fixed some tree edge cases