Write s where necessary (9/47)

Write s where necessary