Stonecutter fixes/additons