Write s where necessary (5/47)

Write s where necessary