add -t and -p options to other modes as well