more soup fixes