DEV XML Update

Note that IC2 was rolled back because builds after #307 are quite severely broken right now.

Also contains some nice syntax tweaks Ryan told me about whilst doing this testing.