Move to Dev6

With a couple extra fixes