More Stone Block improvements