Address stof comments