Add pick, shovel, sword;
Some improvements;