More sandstone tweaks + new tomato