Crafting tweaks

See commit descriptions :D