Added Cobblestone and Stone, and many small fixes