A few crafting tests, fixes to code.