Add stone pickaxe, and some minor changes