Write s where necessary (12/47)

Write s where necessary