Dragonfly part 3 and fixes