Switched crystals to metadata and fiddled with other stuff