add -s formatting to relevant commands