More dragon work

Some grindstone updates