Bunch of changes, can now generate a sanely looking spec from DAP