various craft related fixes